Move to gradle 3.0, tools 2.2-beta1 Support lib was stuck in tools 2.2-alpha due to a bug in gradle 2.14 (tools 2.2-beta depends on gradle 2.14). The bug is resolved in gradle 3.0 and tools team suggested us to move to 3.0. I've also added some sane defaults to gradle-properties to get faster builds with in-process dexing and gradle daemon usage Bug: 30160196 Gradle Bug: https://code.google.com/p/android/issues/detail?id=219034 Change-Id: I6a8c310dd252d160565b6bd57635a8d4ee41dc6b
diff --git a/gradlew b/gradlew index 89509d7..9d82f78 100755 --- a/gradlew +++ b/gradlew
@@ -42,11 +42,6 @@ ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -61,9 +56,9 @@ fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -114,6 +109,7 @@ if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` @@ -161,14 +157,4 @@ eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" -# Change the project's .gradle to the android out dir. -ANDROID_GRADLE_ROOT="$APP_HOME/../../out/host/gradle/frameworks/support" -if [[ -z "$ANDROID_CACHE_DIR" ]]; then - ANDROID_CACHE_DIR="$ANDROID_GRADLE_ROOT/.gradle" -fi - -# Change the local user directories to be under the android out dir -export GRADLE_USER_HOME="$ANDROID_GRADLE_ROOT/.gradle" -export M2_HOME="$ANDROID_GRADLE_ROOT/.m2" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain --project-cache-dir=$ANDROID_CACHE_DIR "$@" +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" 